From 819262ede2d8b6105e81f36588df8280b39525ec Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sun, 20 Nov 2011 20:14:08 +0000 Subject: [PATCH] Fix more no-value-added GCC warnings. --- gpsbabel/compegps.c | 1 + gpsbabel/itracku.c | 1 + gpsbabel/mac/libusb/darwin.c | 4 ++-- gpsbabel/mmo.c | 10 ++++++---- gpsbabel/ozi.c | 2 ++ gpsbabel/pathaway.c | 2 ++ gpsbabel/shape.c | 1 + gpsbabel/stmsdf.c | 1 + gpsbabel/stmwpp.c | 1 + gpsbabel/unicsv.c | 1 + 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gpsbabel/compegps.c b/gpsbabel/compegps.c index 1ff184f60..196303038 100644 --- a/gpsbabel/compegps.c +++ b/gpsbabel/compegps.c @@ -681,6 +681,7 @@ compegps_data_write(void) switch (global_opts.objective) { case wptdata: + case unknown_gpsdata: curr_index = target_index = 0; write_waypoints(); break; diff --git a/gpsbabel/itracku.c b/gpsbabel/itracku.c index 24092284f..be26c2e7a 100644 --- a/gpsbabel/itracku.c +++ b/gpsbabel/itracku.c @@ -608,6 +608,7 @@ itracku_read(void) { switch (global_opts.objective) { case wptdata: + case unknown_gpsdata: itracku_read_waypt(); break; case trkdata: diff --git a/gpsbabel/mac/libusb/darwin.c b/gpsbabel/mac/libusb/darwin.c index 91825cb05..749e09ecc 100644 --- a/gpsbabel/mac/libusb/darwin.c +++ b/gpsbabel/mac/libusb/darwin.c @@ -1115,7 +1115,7 @@ int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices) result = (*(device))->GetDeviceAddress(device, (USBDeviceAddress *)&address); if (usb_debug >= 2) - fprintf(stderr, "usb_os_find_devices: Found USB device at location 0x%08lx\n", location); + fprintf(stderr, "usb_os_find_devices: Found USB device at location 0x%08lx\n", (long) location); /* first byte of location appears to be associated with the device's bus */ if (location >> 24 == bus_loc >> 24) { @@ -1143,7 +1143,7 @@ int usb_os_find_devices(struct usb_bus *bus, struct usb_device **devices) if (usb_debug >= 2) fprintf(stderr, "usb_os_find_devices: Found %s on %s at location 0x%08lx\n", - dev->filename, bus->dirname, location); + dev->filename, bus->dirname, (long) location); } /* release the device now */ diff --git a/gpsbabel/mmo.c b/gpsbabel/mmo.c index 4b4671b2d..58f9843b4 100644 --- a/gpsbabel/mmo.c +++ b/gpsbabel/mmo.c @@ -212,7 +212,9 @@ mmo_readstr(void) if (len) { gbfread(res, len, 1, fin); if (len != strlen(res)) { - fprintf(stdout, "got len %d but str is '%s' (strlen %d)\n", len, res, strlen(res)); + // strlen requires a size_t, but Microsoft's stupid compiler doesn't + // do C99 %zd. Thanx, Microsoft. + fprintf(stdout, "got len %d but str is '%s' (strlen %d)\n", len, res, (int) strlen(res)); fatal(MYNAME ": Error in file structure!\n"); } } @@ -858,12 +860,12 @@ mmo_read_CObjCurrentPosition(mmo_data_t* data) xfree(name); // XXX ARB was just: mmo_fillbuf(buf, 13, 1); // but actually it's string/long/string/long/long - gbfgetuint32(fin); + (void) gbfgetuint32(fin); name = mmo_readstr(); DBG((sobj, "name = \"%s\"\n", name)); xfree(name); - gbfgetuint32(fin); - gbfgetuint32(fin); + (void) gbfgetuint32(fin); + (void) gbfgetuint32(fin); } } diff --git a/gpsbabel/ozi.c b/gpsbabel/ozi.c index 056f53e36..d5f6e7a79 100644 --- a/gpsbabel/ozi.c +++ b/gpsbabel/ozi.c @@ -816,6 +816,7 @@ data_read(void) break; case wptdata: + case unknown_gpsdata: ozi_parse_waypt(i, s, wpt_tmp, fsdata); break; case posndata: @@ -844,6 +845,7 @@ data_read(void) } break; case wptdata: + case unknown_gpsdata: if (linecount > 4) { /* skipping over file header */ fs_chain_add(&(wpt_tmp->fs), (format_specific_data *) fsdata); diff --git a/gpsbabel/pathaway.c b/gpsbabel/pathaway.c index 340476964..e88b3acaa 100644 --- a/gpsbabel/pathaway.c +++ b/gpsbabel/pathaway.c @@ -588,6 +588,7 @@ static void ppdb_read(void) ppdb_read_wpt(route_head, 1); break; case wptdata: + case unknown_gpsdata: ppdb_read_wpt(NULL, 0); break; case posndata: @@ -763,6 +764,7 @@ static void ppdb_write(void) switch (global_opts.objective) { /* Only one target is possible */ case wptdata: + case unknown_gpsdata: if (opt_dbname == NULL) { strncpy(file_out->name, "PathAway Waypoints", PDB_DBNAMELEN); } diff --git a/gpsbabel/shape.c b/gpsbabel/shape.c index 965ac7a04..c394b7ace 100644 --- a/gpsbabel/shape.c +++ b/gpsbabel/shape.c @@ -314,6 +314,7 @@ my_write(void) { switch (global_opts.objective) { case wptdata: + case unknown_gpsdata: ohandle = SHPCreate(ofname, SHPT_POINT); if (ohandle == NULL) { diff --git a/gpsbabel/stmsdf.c b/gpsbabel/stmsdf.c index ea6b51565..b80feddff 100644 --- a/gpsbabel/stmsdf.c +++ b/gpsbabel/stmsdf.c @@ -719,6 +719,7 @@ data_write(void) switch (global_opts.objective) { case wptdata: + case unknown_gpsdata: break; case rtedata: diff --git a/gpsbabel/stmwpp.c b/gpsbabel/stmwpp.c index b3c703397..df2dbede6 100644 --- a/gpsbabel/stmwpp.c +++ b/gpsbabel/stmwpp.c @@ -300,6 +300,7 @@ stmwpp_data_write(void) switch (global_opts.objective) { case wptdata: + case unknown_gpsdata: what = STM_WAYPT; track_index = track_num; /* disable filter */ setshort_defname(short_h, "WPT"); diff --git a/gpsbabel/unicsv.c b/gpsbabel/unicsv.c index 819a84032..9028739af 100644 --- a/gpsbabel/unicsv.c +++ b/gpsbabel/unicsv.c @@ -1934,6 +1934,7 @@ unicsv_wr(void) { switch (global_opts.objective) { case wptdata: + case unknown_gpsdata: waypt_disp_all(unicsv_waypt_enum_cb); break; case trkdata: -- 2.30.2